Test for bin->child being present before doing anything with it. Patch

2001-05-07  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
	present before doing anything with it.  Patch from Håvard Kvålen
	<havardk@netcom.no>.

diff --git a/ChangeLog b/ChangeLog
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 924440869b531244bea9c7a8a01200e93432ef3f..7accc54e782bb767baae3c3b1ae1539af9561203 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-05-07  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
+       present before doing anything with it.  Patch from Håvard Kvålen
+       <havardk@netcom.no>.
+
 2001-05-04  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: fix some shell typos

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 52654dab0864ef63561e05afa6af17693fb754ee..6ae3b859cea7f2cffa89e35b6dc0abe512f75688 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2417,7 +2417,8 @@ gtk_window_focus (GtkContainer     *container,
     }
 
   /* Now try to focus the first widget in the window */
-  if (GTK_WIDGET_DRAWABLE (bin->child) &&
+  if (bin->child &&
+      GTK_WIDGET_DRAWABLE (bin->child) &&
       GTK_WIDGET_IS_SENSITIVE (bin->child))
     {
       if (GTK_IS_CONTAINER (bin->child))